Merge branch 'matthiasc/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Sat, 12 Sep 2020 16:25:17 +0000 (16:25 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 12 Sep 2020 16:25:17 +0000 (16:25 +0000)
Matthiasc/for master

Closes #3110 and #2994

See merge request GNOME/gtk!2565


Trivial merge